Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master from develop #1655

Merged
merged 138 commits into from
Dec 14, 2015
Merged

Update master from develop #1655

merged 138 commits into from
Dec 14, 2015

Conversation

engelgabriel
Copy link
Member

No description provided.

rodrigok and others added 30 commits December 3, 2015 19:58
…m:RocketChat/Rocket.Chat into livechat-manager
Conflicts:
	packages/rocketchat-livechat/i18n/en.i18n.json
	packages/rocketchat-livechat/package.js
Remove the icons that are not mirrored to regular locations. And moved the icons that need mirroring to mirrored locations. Replaced "octicon-chevron-right" with new set of mirrored icons from fontello
fduraibi and others added 27 commits December 11, 2015 16:01
When a new avatar is saved the user name gets encoded using `encodeURIComponent`, this does not affect names in latin characters, however it does change non-latin/unicode names to an encoded string.

However, when reading the avatar image file, the function uses the username directly without enocinding it, so latin names work since the encoding doesn't change anything, however, Unicode names don't since the usernames don't match the encoded names.

This fix adds the encoding function when reading the avatars.
Also adds the encoding to the function that writes avatars from URL.
fix broken image-link when og:image contains "&" (e.g. Google Maps)
The avatar image move need to only be done if a previous username exists. 
Also we need `encodeURIComponent` to support names in unicode.
Rocket.Cat Shouldn't be Admin, allowing first users to be admins again
Show toastr messages on the left side
…d-of-private-group

Fix 'create new' in private group list opening 'create channel' flex
Fixed indentation and added unicode support
Setting allows admin to modify Meteor.loginTokenExpires from default 90 days to something else.
Server restart is required for this setting to take effect.
Default value is still 90 days if not modified by admin.
This is a good start. LIke noted by @litewhatever there are limitations that related to the way meteor works. I can see some workarounds we could do, but that would need to be discussed and maybe submitted back to MDG.
* lingohub:
  Created and pushed by LingoHub. Project: 'Rocket.Chat' by User: '[email protected]'.

Conflicts:
	packages/rocketchat-livechat/app/i18n/en.i18n.json
engelgabriel added a commit that referenced this pull request Dec 14, 2015
@engelgabriel engelgabriel merged commit 0ea5058 into master Dec 14, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.